Merge "Remove delay received from audio layer for A2DP state changes"