Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev