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