Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev