Merge "Merge "Reset visibilities if mDummyControlTarget is the control target"...
Merge "Merge "Reset visibilities if mDummyControlTarget is the control target" into rvc-dev am: efd288a3 am: 1c43b15b am: 5bd59e06" into rvc-qpr-dev-plus-aosp am: 75ba9547
Change-Id: I6b1dd3f9d6b89dccfbbe6064af4c29d4259a7e49