* cherry picked from commit 14a7fe0266 * fix main menu minor changes cherry picked from commit f917f5c8d0
14a7fe0266
f917f5c8d0