Merge "Remove ENABLE_MATERIAL_U_POPUP flag and cleanup dead code" into main