Merge "Remove bounce "unlock hint" on keyguard" into main