Merge "Fixing double system state call in iconCache" into ub-launcher3-calgary-polish