Merge "Revert "Defer tap outside stack until multiwindows""