Merge "Remove skip condition when resize is enable"