Merge "Fix bubble position with IME when the bubble has a custom height" into tm-dev