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

Change-Id: I0ef651ae8259a566951c1b254c9117d52e260a0e