Merge changes I269a748e,I2135920f into main

* changes:
  Adding icons to buttons in touchpad tutorial
  Updating strings in touchpad/keyboard tutorial