Merge "Fix bad crop on clip reveal animation"