Merge "Move the checking of mWindowAttributesChanged closer to relayoutWindow"