Fixed unused variable warnings

Change-Id: I67b16aded45b3e97b66978fb62f426898b80f65e
Merge topic 'refactor_contour_panel' into next

cff472f Fixed unused variable warnings