Merge "Deleting SecondaryHomeApp" into sc-dev