Merge "Scale PS4/PS5 controller touchpad input" into main