Merge "Fix the takeoff position of a flung windowshade."