Merge "Sync with ISurfaceComposer changes" into tm-dev