Merge "Instrument jank between lockscreen and AoD" into sc-dev