Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev