Merge "audio policy: fix delayed command insertion"