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

Change-Id: I6499315f9a6bb1c667f585c2f2e088506fbc8607