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