Merge "Only resize the menu on hide if it was resized on show" into sc-dev