Merge "Apply package visibility for apps with shared userId" into sc-dev