Merge "Fix packageinstaller display issue"