575f130854
* cherry picked from commit14a7fe0266
* fix main menu minor changes cherry picked from commitf917f5c8d0
* cherry picked from commit14a7fe0266
* fix main menu minor changes cherry picked from commitf917f5c8d0