Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
am: 70d24a0b1f

Change-Id: I5569896a94ba6d34cb75b83bacdf44ddc8a9ae28