Merge "Move list of SystemUI services to xml"