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

Change-Id: I2e0cd8780ea9ff9c6dcf62746def46ae943ce445