Merge "Add undeploy xApp function"