Merge proposals dependent on lp://staging/~joerlend.schinstad-deactivatedaccount/quidgets/main

1. main
2. Dependent merge proposals