Merge "Add support for audio focus locking" into lmp-mr1-dev