Merge "Refactor sensor service mode changing logic"