Fix Navring shows up on all buttons

Change-Id: I008b9e29628ada3ea728ce12233a50915c77c76b
Merge "Fix Navring shows up on all buttons" into jb4.2