Merge "Extend pip dismiss overlay to under cutout" into sc-dev