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

Change-Id: I578a447f88ee09da77f4974bce1a23e2c93ed40f