Merge "Update KeyguardViewMediator field to primitive type." into main