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: bfa361a6 am: 5131d0d8 am: 7a155abf
Change-Id: I21e2f66a75da4927edb0a740257d773f4e60c6ad