[fixed] Decoration condition dropping too much when chcking status - not
retroactive

Change-Id: I61b8cb2c753f6bf402526d83d8aa7007232fad5d
Merge "[fixed] Decoration condition dropping too much when chcking status - not retroactive" into unstable