Merge "Block touches under scrimmed bouncer" into qt-dev
am: f9bf1762ce

Change-Id: I4b226012472ba7a929756b311951f8963e99fa74