Merge "Merge "Compare with oldSoftInputMode after restoring softInputMode" into rvc-qpr-dev am: 6a1829d14a" into rvc-qpr-dev-plus-aosp