Merge proposals dependent on lp://qastaging/~zsombi/ubuntu-ui-toolkit/statesaver-vs-urihandler

1. statesaver-vs-urihandler
2. Dependent merge proposals