Merge "Make ActivityStarter single use."