fix for menu and spinner aotp
@rev icangea, dchasman@
@bug W-2037153@
Merging origin/alireza/master-pending-menu-aotp-bugs into master