Merge "Add disable/enable camera service watchdog feature" into tm-qpr-dev