Merge "Layout updates to share sheet" into oc-dr1-dev