Merge "Take screenshot only when screenshot is requested" into rvc-dev am:...
Merge "Take screenshot only when screenshot is requested" into rvc-dev am: 80bc2f6a am: a08f81d6 am: c9c82c75 am: 339bff13
Change-Id: I29fa1eeecaacf6ccd18aa29843d1aceac638c604