Moving check whether image is active or not under retry deco

Change-Id: Ic451020b8b92bb928a78c0de9a049562f955b88e
Merge "Moving check whether image is active or not under retry deco"