Merge "Update data usage code from settingslib" into qt-dev