Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev