Merge "Attached the navigation bar to app for launching from notification" into sc-dev