Merge "Correctly initialize/refresh layers."