Merge "Set activity state to PAUSED when making visible from STOPPING/STOPPED" into qt-dev