Merge "InputController: Wait for associated display sync for input devices" into main