Merge "Fix bottom margin of footer actions" into tm-dev