Merge changes I1abd0ec8,I084cb05b

* changes:
  Add more debug information.
  Add UiLayout function in SettingsPage