Merge "Fix index when moving SecurityFooter" into sc-dev