Merge "Merge "Create a set icon visibility interface for footer" into tm-dev am: 7cb4f13fc3 am: 67e771b0e4 am: 1e69d44fbb am: dfe167922a"