Merge "clean up layout & styling of notification history" into rvc-dev