Merge "Support content description with app name"