Merge "Don't reset Z order if the expanded view is temporarily animated out." into sc-dev