Merge "Fix messed-up divider position when unlocking with IME showing" into main