Merge "Avoid changing resize dim layer if not needed"