Merge "Take screenshot only when screenshot is requested" into rvc-dev am: 80bc2f6a57

Change-Id: I072097a7c9aae63dcf9c4ef5e0e9483179b509b3