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