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

Change-Id: I1a4373d24dea656313dcd64b86c20e2d512cbe5f