sharing-desktop: address comments on !138 (merged) screen-shot-record: address comment on !137 (merged)