Merge "Fix some layout issues in notification guts" into rvc-dev