Track own Settings
Merge branch 'jb-mr2' of https://github.com/OurROM/platform_manifest into jb-mr2