Merge "Move key remapping to InputReader thread(2/n)" into main