Merge "Fix Keyboard not hiding when dismissing remote input from shade"