Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()"