Merge "Fix bug 5185375 - ICS Fit+Finish: Full-screen IME"