Merge "Broadcast to device lock state listeners inside a synchronized block" into main