Merge "Update Theme.DeviceDefault.Settings's colorEdgeEffect" into qt-dev
am: 23ef465d2b

Change-Id: Icb2c52dd1f2daea3cdc31b9eda0f9d2c84359d06