Merge "Add AC xApp control screen"