Merge "Merge "Also update color when changing the visibility" into rvc-dev am:...
Merge "Merge "Also update color when changing the visibility" into rvc-dev am: 70a7cbf9 am: 38735d6a" into rvc-d1-dev-plus-aosp am: 37d464b9
Change-Id: I916ef5d64c4bd18d1fc781f5347a13661a1a5dfc