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

Change-Id: Ice6c8d962a4d820bfa9305ea72583d7dc5c8a4b4