Merge "Invoke keyguard going away when it is collecting for wake" into sc-v2-dev