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

Change-Id: Ifdd82ae4b631558c0ed4dee779bbf0792e3287d7