Merge "Revert "Notify the visibility change to update color views without control."" into rvc-dev