Merge changes of NavigationBarView from aokp/jb-mr1 into jb-4.2 branch