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

Change-Id: Ibbbb8947eeaae6c2f883f725de8c6dec8b25792c