Merge proposals dependent on lp://qastaging/~attente/ubuntu-themes/battery-plugged-broken-symlink

1. battery-plugged-broken-symlink
2. Dependent merge proposals