Merge "Add NullPtrCheck when smearing in settings" into pi-dev