Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev