Merge "Fixing max-zoom-scale not taking into account the the fullScreen scale" into ub-launcher3-rvc-dev am: 43e789ff9b

Change-Id: I9de7f31b066f9cc45d2c703db4c207252b3fe595