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

Change-Id: Ia755eec707cae16f1fd1bfcf1d1670258fee48a1