Merge "Shrink notification history views to fit" into sc-qpr1-dev