Merge "GlobalActions: Fix scrim with display cutouts"