Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev