Merge "Fix wrong surfaceRequiresRedraw check"