Merge changes from topic "grid-size-migration" into ub-launcher3-rvc-dev am: 879d3ade68

Change-Id: I0a8688f66bbe3312b22305639b62ac0c5e7e1b0c