Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-qpr1-dev