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

Change-Id: Ie0244bba16f9bd3dec8c36f609777331278500bb