Merge "Wait for keyguard showing rather than app not visible when going to sleep." into main