Merge "Fix sharesheet height expansion." into rvc-dev am: 9c3ed4de9f am: bcf162c2e8 am: 37e1a30a04

Change-Id: Ic2b9e3ede838eaef125b13797a6a50250ef8e75a