Merge "Reenable task snapshots without using RenderThread in SystemServer."