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

Change-Id: I94b5abbf1d292a01ba439cafd80938f7fc92854d