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

Change-Id: I2783d7d594bb2b49581cbb466e55f8ce3edd3bea