Merge "Remove ImfLock dependency from IMM#get*InputMethod()" into main