Merge "Supress menu if screen ought to be hidden." into lmp-dev