Merge "Adds a PhoneStateMonitor to the AssistManager" into qt-dev