Merge "Fix shift in share sheet" into oc-mr1-dev