Manual merge. Preference activity changes to work on smaller tablet screens and phones.

Padding around fragments and to the left of preference items
adjusted for different display sizes.

Change-Id: I2d29e5525c381092a3f1d2fb1265ce07db893d78