Merge "Fix notification history crash & layout" into rvc-dev