Merge proposals dependent on lp:~timchen119/unity-control-center/unity-control-center.lp1417034

1. unity-control-center.lp1417034
2. Dependent merge proposals