Merge "ISurfaceComposer: boundary check input on CAPTURE_LAYERS" into rvc-dev