Merge "Check isInteractive after traversal before hiding keyguard." into udc-d1-dev