am 5778cb9a: Merge "Always use the correct pixel store size Bug #7357394" into jb-mr1-dev

* commit '5778cb9a98aacd74c7f915b2d02eccc7189d5946':
  Always use the correct pixel store size Bug #7357394