Merge "Don\'t send screen unless we\'re talking to a new adbd." am: 9f90368701 am: 5e3589da14
am: 50bf3dca0f

* commit '50bf3dca0fdbc6539c84c9ddb18f353ac270ec9c':