Merge "Clean up graphics resources." into lmp-mr1-dev