timob-15126: fix menu regression.
Merge pull request #4683 from hieupham007/timob-15126

timob-15126: fix menu regression.