Merge proposals dependent on lp://staging/~timo-jyrinki/ubuntu-settings-components/rebuild_against_qt521

1. rebuild_against_qt521
2. Dependent merge proposals