Merge "Fix NPE when content visibility changes" into rvc-dev