Merge "Moving some methods to PendingIntentController" into qt-dev