Merge "Deprecate KeyguardStateController" into main