Merge "Add shared transitions for screenshot->markup"