Merge "[AT-SPI] Add resource id to window attribute" into devel/master