Merge "Rollback SHELL UID check for CarrierConfigLoader" into qt-dev