The workardound is necessary in <4.0, not <4.1. The "contentintent == null" check is gone in the 4.0.1 source tree.