Merge changes Ie96bf43d,Ib0572d4b

* changes:
  Update the intro screen after select on a more options row
  Add the Another device row in the more options screen