Merge "Refactor ExpandableView to maintain its own ExpandableViewState."