Merge "Add secure settings key for software cursor."