Merge "Animate the scrim and properly remove the expanded view" into udc-dev