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