Merge "Guard against null Context in attachInfo()." into klp-dev