Merge "Add try/catch to handle invalid settings activity" into main