Merge "Fix fgs_footer gravity" into tm-dev