Merge "Fix IME layer"