Merge "Make sure correct default values for ActivityStarter."