Merge "Password bouncer - Fix IME with no view" into sc-dev