Merge "IMMS should preserve selected IME upon boot"