Merge changes Id9289826,If9cc89df

* changes:
  Put security footers in new footer
  Implement correct dimens for new footer