Merge "overlay: Fix BWC buffer size"