am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
automerge: bf6af73

* commit 'bf6af73de6b24e53e9656da75b542d2f8caa77e6':
  Defer tap outside stack until multiwindows