Merge "Fix AOD scrim excluded area"