Merge "Take screenshot only when screenshot is requested" into rvc-dev