Merge "Remove obsolete Smart Lock developer settings" into main