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

Change-Id: I49166bdd4fe51eac9d2f115d8916f504f7a2dd22