Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev