Merge "SoftAMR: Signal the right frame format"