Merge "Protect the Settings application from potential null pointer exceptions." into main