Merge "Set secondaryView to GONE when invisible" into rvc-dev