Merge proposals dependent on lp://staging/~jonas-drange/ubuntu-system-settings/dim-timeout-1437510-vivid

1. dim-timeout-1437510-vivid
2. Dependent merge proposals