am b803a2be: Refactor screen blocking logic.

* commit 'b803a2be0f54e7b4f1b5f606dbda4dbf86307f12':
  Refactor screen blocking logic.