Merge "Make package handling in openContentUri more robust" into sc-dev