Merge "Fix shift in share sheet" into oc-mr1-dev am: 3a31bdede5
am: 8ca3a3661b

Change-Id: I01fd171b46d36e0604b169283934b2af0c7add97