Merge "Using proper checks for hardware bitmap usage" into ub-launcher3-master