Merge: from mt_snapshot_saving - Bugfix for accessing null buffer on non-main thread Tests: booted to Craggy