Merge "Set activity state to STARTED when making visible from STOPPED"