Plans advance for major Edinburgh facility to house Scotland’s art