Merge proposals dependent on lp://qastaging/~abreu-alexandre/webapps-applications/fix-amazon-cloud-reader-icon

1. fix-amazon-cloud-reader-icon
2. Dependent merge proposals