Merge "Merge "Set activity state to PAUSED when making visible from STOPPING/STOPPED" into qt-dev am: 1b33cfbc am: 212ed95c" into qt-r1-dev-plus-aosp