Merge "Also update color when changing the visibility" into rvc-dev am: 70a7cbf9 am: 38735d6a am: b7d50384 Change-Id: I0065bbed49145ee01a449da6b976421bacddbec1