VE-1613: Proper handling for expand in new galleries