Merge "Fix ExpandableView's transient container tracking; prevent crash when mismatched."