Merge "Ignore any Recents changes while Keyguard is locked" into main