Merge "codec2: handle multiple maps in linear block" into pi-dev