Merge "Send ActivityOptions to client"