Merge "Avoid bouncing user unlocked broadcast on main thread" into main