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

1. fix-1566903
2. Dependent merge proposals