Merge "Check for false touches when determining if the notif menu should be...
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev am: 70739fb8
am: 2cd3e9c5
Change-Id: I393a87e48487ec51fc563cc1cb9f50d604970dc0