DO NOT MERGE: Issue 2106: Live Preview Snapshot

This is a PR for issue #2106.
Safe to use `self` in this block or do you need a `strongSelf` to `weakSelf` dance?