graphics: Several updates pulled from jb-mr1.1-release