Per app layout, at last :)

Change-Id: I865c01dab91d91fee8193fe36c550974db00fae0
Merge branch 'cm-10.1' of https://github.com/BeerGang/android_packages_apps_Settings into HEAD