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