Merge "Change hwui jank detection to use deadline & gpu completion (2/2)" into sc-dev