Merge "Go back to using ambientState for footer hiding" into main