Merge "Detect surface resizes"