Merge "Add secure settings to the test apps"