Merge "Fix bug 3425610 Adjust Lock sound level"