Merge "Fix metrics didn't log ONE_HANDED_TRIGGER_GESTURE_OUT logs when NavigationBar type is Gesture Navi" into sc-dev