Avoid figures to sub-divide columns

Avoid figures to float and make text go around them.

Change-Id: I10e11a59bbb094bfb42f6864d2a479716c6d5942
Merge "Avoid figures to sub-divide columns"