Merge "Resolve setContentIntent to single code path"