Merge changes Ibe5f1cdc,I219f48b2 into ub-launcher3-master

* changes:
  Increase icon cache version
  Not using reflection for app-usage API