Merge "[DO NOT MERGE] Fix bugs with changing service gesture detection state."