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

Change-Id: I632348618be5d43282369d4c4e7b7b27703da1b2