Merge "Removing forced layout when the window is translated."