Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev