Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev am: 2233ba3eb5
am: 93aee3993b

Change-Id: Ied1782027bb1a922f6c2dfc1bba972b57ed68695