Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev
am: 70739fb812

Change-Id: Ie2014ee92ec3fb629801b18465ec42c36b6e2283