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

Change-Id: Idb9599dd389a85927f64f9660f88ee3f81e22ae0