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

Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48