Merge "Redesign of QSSecurityFooter" into oc-dev