Merge "Fix settings show data usage with the uid of a removed package"