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

* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows