Use TOC only when page is supposed to have it

Change-Id: I694dfbada957cffb8f72854bea138f9a021ff31d
Merge "Use TOC only when page is supposed to have it"