Merge "Reduce situations where black thumbnail occurs." into jb-mr2-dev