Merge "Add sm set-isolated-storage [true|false]"