Merge "Add jank instrumentation logic in keyguard"