Merge "Attempt to fix missing lock sounds" into jb-mr1-dev