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