Merge "Rename getLayerState and getDisplayState functions."