Merge "Give each preference screen its own activity and toolbar title" into sc-dev