Merge "Disable sounds on menu button" into oc-dev