paprefs 5.3

some minor bugfixes, style changes

Change-Id: I508a36087cfbf7448713e293e42dcedbb79fc369
Merge remote-tracking branch 'upstream/jellybean' into HEAD