Merge "Add developer settings for theme overlays."