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

* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
  Defer tap outside stack until multiwindows