Merge "Fix Sharesheet nest scrolling issue introduced by using RecyclerView" into rvc-dev am: 973ec1172b am: ec1088c1c7 am: 651d0eed72

Change-Id: I60a714b3d57994b757bc42d4804f98a4314b73a4