Merge "Creating UserProperty for deciding intent resolution strategy"