Revert "[2/2] Settings: Add an option to reset custom user preferences"

This reverts commit 36ffb041ec3e5dd3d7faafc638130d0807f4002e.

This commit breaks quick pulldown settings, until a proper fix is found, revert it.

PS2: delete whitespace

Change-Id: I202b28e78a619a2c8db349c998573c546943e478
Merge "Revert "[2/2] Settings: Add an option to reset custom user preferences"" into pac-4.4