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

* commit '764bc0a7ae9c623f18aceadda2d5d894b1bf4024':
  Remove unnecessary locking for screen broadcasts.