Merge "Fix clip reveal animation in docked window case" into nyc-dev