Merge "Update Theme.DeviceDefault.Settings's colorEdgeEffect" into qt-dev