Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev
am: 503b489384

Change-Id: I909a6fab95581a4c001486aef84d70ccc5221e50