Merge "Revert "Shutoff calls to KeyguardStatusViewController"" into main