Merge "Attach navigation bar to app during quick switching (2/N)" into sc-dev