Port version agnostic changes from 19.04/18.10->18.04

[brs17]

Distribution (run cat /etc/os-release): 18.04

Issue/Bug Description: I noticed this morning patches such as https://github.com/pop-os/default-settings/commit/07b30cc5bd05e52ff6125398da7c0ff99466bbbc have not been applied to the bionic_master branch as well. I was about to create a pr to fix that, when I realized a number of changes (that don't appear to be specific to 19.04/18.10 have not been ported back to 18.04 (such as https://github.com/pop-os/default-settings/commit/4f4a1db65419d57eea3b484a3012119cfd7d0beb)

I could go ahead with a pr for fixing the Popsicle renaming (which I see as a more crucial bug than the feature request for Allowing folder edits by only setting pop app folders on first login).

But I think the bigger issue making sure we apply all necessary patches and not apply patches we don't need in bionic.