Bug 964508 - Rename TwoLineRow members and move icon code to TwoLinePageRow (r=margaret)