Merge "Need to updateSurface if surface size was changed in relayoutWindow"