Merge "Delay audio notification on user interaction" into jb-dev