Update non-AOKP settings with new CMD rework