Merge "Fix sharesheet scroll jankiness." into rvc-dev am: afbd12c4ed am: 24d24cfd27

Change-Id: Ic5271d13492020737e52ffc60b92a7df5efded51