Merge "[ATSPI] Sort children using middle line" into devel/master