Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev