Merge "closeInstall() and enableGsi() code cleanup"