Merge "Fix preference layouts so that custom preferences don't break."