Merge "Disable additional KeyguardStatusViewController callbacks" into main