Merge "Compare with oldSoftInputMode after restoring softInputMode" into rvc-qpr-dev