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

Change-Id: I66f385fb137dbde5d379edd1d5ac1acad64ed32e