Merge "Fix IME layering target above IME surface" into sc-v2-dev