Fix layout cache on page without menu id
Merge remote-tracking branch 'origin/master'