Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev