Merge "Make screenshot animation display over cutout area" into sc-dev