Merge "Account for cutouts in system insets (as done previously)"