Merge "Hide footer in place instead of scrolling it offscreen" into sc-dev