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

Change-Id: I26a7f5a78aa46c608cc50e83bb96c8e1c6a3e004