Merge "Set activity state to PAUSED when making visible from STOPPING/STOPPED"...
Merge "Set activity state to PAUSED when making visible from STOPPING/STOPPED" into qt-dev am: 1b33cfbc
am: 212ed95c
Change-Id: Ie48e14c4b98def810df11ac57f7bda865c87fb60