Merge "Fix fickle footer visibility" into sc-dev