Merge "Promote keyguardGoingAwayWallpaper check condition." into rvc-dev