Merge "Fix 6437474: Fixed black box appearing on rotation" into jb-dev