Merge "Improve shouldRestoreImeVisibility perf" into sc-qpr1-dev