Merge "End screenshot animation early on layout change" into sc-dev