Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev