Merge "Improve SystemUIBootTiming performance in OneHandedController" into sc-dev