Merge "Refactor start activity methods"