Merge "Fixed attaching nav to app not working for notification case" into sc-dev