Merge "Consolidate the 2 app button prefernece controllers."