Merge "Save or destroy activity surface based on property"