Merge "SF: Pass the correct layer creation args when mirroring"