Merge proposals dependent on lp://qastaging/~verzegnassi-stefano/ubuntu-docviewer-app/fix-1545142

1. fix-1545142
2. Dependent merge proposals