Merge "Add AC xApp control screen"

No match.