Integrate Dirty Tweaks into Settings [2/2]

Change-Id: I4539f9da99a771abf05faa525712773191dd4a99