Merge "Take #2: Shutoff calls to KeyguardStatusViewController" into main