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

Change-Id: I653e4502a8f355e22689eabe8d3a124e5344aa43