Merge "remove PROP_QTAGUID_ENABLED"