Merge "Return error code when there's an error starting an activity" into main