Merge "Create a set icon visibility interface for footer" into tm-dev