Merge "Fix not intercepting touch event while in modal mode"