* commit '1cf21e44': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings