Merge "Restore timing of hideKeyguardViewAfterRemoteAnimation with the fast unlock flag." into main