Merge "Revert "Add shared transitions for screenshot->markup""