Merge "Move some stuff to SettingsLib to use for Settings Home"