Merge proposals dependent on lp://qastaging/~ken-vandine/camera-app/content-hub_and_add-profile

1. content-hub_and_add-profile
2. Dependent merge proposals