Merge "Ensure package context used by System UI has a valid userId." into sc-qpr1-dev