Merge "Redesign of QSSecurityFooter"