Merge "[478802] Remove not needed reInitFigure"