Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev