Merge "Sharesheet - 4->8 direct share expansion fix" into qt-dev