Merge "Redesign QSSecurityFooter dialog" into oc-dev