Merge "Fix border color of security footer" into sc-dev