Merge "Revert "Notify the visibility change to update color views without control."" into rvc-dev am: d1cfb337cf am: 800390aebb

Change-Id: I92ce4640cc9beaf79ffbededbc18faffa4868034