Merge "Upstream Wear Keyguard changes"