[automerger skipped] Merge "DO NOT MERGE: Freeup lock when IME is set inactive...
[automerger skipped] Merge "DO NOT MERGE: Freeup lock when IME is set inactive and unbound" into qt-qpr1-dev am: c53b7367
am: f8916199 -s ours
am skip reason: subject contains skip directive
Change-Id: I1a4373d24dea656313dcd64b86c20e2d512cbe5f