Merge "Layout mExpansionViewContainer when not displayed"