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

Change-Id: I4ac88efc3f198c8b3632bbaae3367e7363c2a5a1