Merge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0 am: 0fcb7719e0
am: 2aea4cae01

Change-Id: I2eb8b57458721a1b78766552cb5a12c284b291e7