Merge "Fix missing share context option in settings app" into sc-dev