Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs am: ca7eee3d11
am: ab35b73d1b

Change-Id: I37c06297dce5822845d044c82f8e030d23ea850f