Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0