Merge "Refactor app open code."