Merge "Cleaning up detect_transition_to_still()."