Merge "Treat IME adjust flags correctly"