Merge "Fix back does not hide keyboard first in bouncer" into main