Fix for navbar back/menu firing for longpress actions

Change-Id: I9661b8faa001e69b3a44c91d53f0e858031d08dd
Merge "Fix for navbar back/menu firing for longpress actions" into jb4.2