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 am: 353e3a56
Change-Id: Ib9b9eb4f092525b9eca8f1fed61ac2ba40beca28