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

Change-Id: I29fa1eeecaacf6ccd18aa29843d1aceac638c604