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

Change-Id: Iade0efb71c6f38ddc873d3376a4d6046f07cd35b