Merge "SF: Store and manage snapshots for virtual displays" into main