Merge "[AT-SPI] Make ToolkitName customizable" into devel/master