Merge "Refactored ActivityStarter#startActivityUnchecked to make it easier to follow"