Merge "Hide SoftInput when INVALID_DISPLAY"