Merge "check for U+ before checking device feature flags"