Merge "Fix initial notification icon visibility" into rvc-dev