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: 0416e1b2
Change-Id: I5164d6dcfe608ec46c8f9741b1915d7770d3cadc