Merge "Update nav buttons current view after inflates occur" into pi-dev