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: c907e7dd am: b3826dde
Change-Id: I230f95e0a957b039da7c03ed23ea7f4ee89ab773