Merge "Improve how we manage the previous app." into ics-mr1