Merge changes Ia684fde5,I58fcb526

* changes:
  Fix the help text
  screenrecord fixes