Merge "Attempt a load reset on touch mode start" into main