Merge "Change ServiceState and TelephonyRegistry logging" into qt-dev