Merge "Bandage fix for bitmap fatal exception where width / height !> 0." into ub-launcher3-qt-r1-dev am: cf92f3edb0
am: b1d8ad6be5

Change-Id: Ifb3662ee293ff5eace912be50e622171a0bcaaa6