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

Change-Id: I4f9c88278a7a9f94be15bcaab8c8df0aca6408ca