Hygiene: Remove unused template variables in Page and Section

Shuffle resources around.

Change-Id: Ie10706afe52977e4b693491789c0eba00bf8ca0c
Merge "Hygiene: Remove unused template variables in Page and Section"