Merge "Make Markup fade in from screenshots" into sc-dev