Merge "Make SoftInputShowHideHistory multi-user aware" into main