Merge "Removing KEYBOARD_EDUCATION flag" into main