Merge "Option to test custom elevation on popup menus" into nyc-support-25.4-dev