am 93853c4c: am b803a2be: Refactor screen blocking logic.

* commit '93853c4c341ebdc2a630fe76767cbd5d86c8249e':
  Refactor screen blocking logic.