Merge "Improve SystemUIBootiming_StartServices_avg" into sc-dev