Merge "DO NOT MERGE: Track SurfaceComposerClient changes" into sc-v2-dev