Merge "Tweak lifecycle of nav bar/view" into sc-dev