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

Change-Id: I503344659b216e68ebf7c31077332d27f9d94888