Merge "New property to control virtual a/b user-space snapshots"