Merge "Preserve intended width/height for Blast adapter layers"