Bug 872329 - Part 1: Apply new settings layout - strings. r=wesj
Bug 872329 - Part 2: Apply new settings layout - xml layouts. r=wesj
Bug 872329 - Part 3: Apply new settings layout - tests. r=gbrown