Merge "Fix clone method for ActivityOptions"