Merge "Camera3: add deferred surface support" into nyc-mr1-dev