Fix menu collapsing when page is scrolled

Change-Id: I37715c0fcf0250958bf608ab6471f32fe5a4a45d
Merge "Fix menu collapsing when page is scrolled"