Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev