Merge "Fix tinting of guest icon in QS footer" into oc-dev