Merge changes I5610b42b,Ib7a52bd0 into pi-dev

* changes:
  ResourceManager: Disable APK Assets cache for real.
  ResourceManager: Disable APK Assets cache.