Merge "Fix not able to auth when notification is expanded" into udc-qpr-dev