Merge "Sharesheet - Add logic to when 4->8 expansion occurs" into qt-dev am: a9146a8c8d
am: 3aa7875e7a

Change-Id: Ia2ceade49df853d6c40bdefeed3b780113e60303