Merge "Attach nav bar to app during transition for non-remote animation case" into sc-dev