Merge "Update Settings owners" into qt-dev