Merge "Enabled removeUidDeviceAffinities" into qt-dev