Merge "Fix double-checked locking in InputMethodSubtype" into oc-dev