Merge "Improve dumps for NotificationShelf views" into tm-qpr-dev