Merge "Move IME button to right side by new desing spec"