Merge "Update nav buttons current view after inflates occur" into pi-dev
am: 3fb64f7f57

Change-Id: I450a4e17d12d871d5f0622110e29ceb49fbc83c3