Merge "Refine LatencyTracker hook point for notification shade swipe"