(bug 43974) making sure that badge is only applied to immediate child

Change-Id: I7039695e36d5641a605a25d1fa714d845b0be383
Merge "(bug 43974) making sure that badge is only applied to immediate child"