Merge "Make additional IME Subtype ID persistent." into nyc-dev