Merge "Adding flag for keyboard education flow" into udc-dev