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