Merge "Fix clickable notification row elements" into rvc-dev