am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."

* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
  Remove unnecessary locking for screen broadcasts.