Merge "Fix INVALID_OPERATION error with layers rendering."