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

Change-Id: I70950da2fe2aa0a2fa01989f557a0acb27ebafdb