Merge "Merge "Fix command injection on screencap" into qt-qpr1-dev am:...

Merge "Merge "Fix command injection on screencap" into qt-qpr1-dev am: addcfc71" into rvc-dev am: 4606008c am: 081aca9e am: 5b4a2ca1

Change-Id: I270c53cccd9f103e9e3488b84c557f4c78773934