Merge "Fix IME target after rotation" into pi-dev