Merge "Remove synchronization from getCurrentInputMethodSubtype()" into nyc-mr1-dev