Merge change 9089

* changes:
  Filmstrip work and boxed bitmap load bugfixes.