Merge "Fix margins & padding to align long screenshot + markup" into sc-dev