'Spectacularly inventive' painting is back on display at the National Gallery