Merge "User correct category for finding headless sync adapters" into mnc-dev