Merge "Fix thumbnail header animation to follow the app window."