Merge "Reset visibilities if mDummyControlTarget is the control target" into rvc-dev