Merge "We don't need black frames for forced display size." into jb-mr1-dev