Merge "Fix command injection on screencap" into rvc-dev am: f24f832f am: 8722f0cd am: 78bc7f37 Change-Id: I111aa5418b52b8172a0afb8cdb3a1f81806f1807