sync enabled layout with system app
Merge branch 'keyboard-v2-test' into virtual-keyboard-v2