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