Merge "Allow switching keyboard layout to null." into nyc-dev