Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev