Merge "Migrate to the new ro property for headless multiuser check." into qt-dev