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

Change-Id: Iea9db807ebc65bcb612294a4283346e714b25f63