Merge changes I2fe9096f,I15b29c88

* changes:
  Split BaseLayout from BasePreference
  Add SettingsPageProvider for SPA