Merge "Fix issue #27291496: Remove Background Check from Settings / Dev Options" into nyc-dev