Merge "Merge "Update visibility when attached" into rvc-dev am: 1262dc84 am: 7c097302" into rvc-d1-dev-plus-aosp