Merge "Avoid IME restart for configChanges" into sc-dev