Start using return value of OnNavigationItemSelectedListener. am: 578015fc3e am: a502cd075f
am: ba4b4c48c7

Change-Id: I774d3ff13f8fce130c1245c72c83b11d5fdc1cfd