Merge "Fix SoftAAC2 flush" into lmp-dev