Merge "Hide SoftInput when INVALID_DISPLAY" into sc-v2-dev