Merge "Fix for NPD in ixheaacd_init_sbr"