Merge "Correct setLayer variants."