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

Change-Id: If05d2770bbb0b2be62d55823d4c98452e317422c