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

Change-Id: Ie88f4bd95f0a9276ed25c98c33e6e8831734e2c1