Merge "More refactor of audio focus, keep track of focus loss"