Revert "Merge pull request #15692 from 6a68/settings-app-WIP-rebased"

This reverts commit 8328ac15d589c213373c0849cfcff9a34e715a25, reversing
changes made to c149d0fe8cb3ca08d28ae1d94d9ee9147be52e68.