Merge "Changed mNumLayers to atomic"