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

Change-Id: I4301f4dfbe75c2cbef7107fcf27270bb009185c9