Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier