Merge "Use CustomizationPickerActivity as main activity" into sc-dev