Merge "KeyUtil: don't use keepOld=true for system DE and volume keys"