Merge "Update divider controller's dim layer when the layer is changed" into nyc-dev