Merge "Correctly position layers."