Merge "Clean up doNotSkipImeByTargetVisibility flag" into main