Merge changes from topic "resolve-merge-conflicts" into qt-dev-plus-aosp

* changes:
  Remove storage sandboxes related code.
  [sf] Move texture deletion to main thread via pool