[fixed] mantis 3536 trap count display at one use

Change-Id: I40f00d8fe79ba046e4fcb75edfbf913bd2757409
Merge "[fixed] mantis 3536 trap count display at one use" into unstable