Merge proposals dependent on lp://staging/~timchen119/gnome-control-center/gnome-control-center.lp1244065

1. gnome-control-center.lp1244065
2. Dependent merge proposals