Merge "Fix wrong package availability check for multi-user."