Merge "Resetting long-press effect state for clicks when keyguard is showing." into main