Merge "Remove unused field from KeyguardStatusBarViewController" into main