Merge "Remove NotificationListController" into tm-qpr-dev