Merge "Add spacing in QS footer and user switcher." into oc-mr1-dev am: 9e009bb07d
am: ff0b836914

Change-Id: I7c317b47f912b0700a035f30c7ba87717ca87188