Merge "Use screenshot file descriptor if available"
am: 6b8e52c805

Change-Id: Ia7f9f5d192dbbb8409e52a29cb73f9cac532f301