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

Change-Id: I77c8d54caf22d52880654cb1d2e70ce452429ebd