Merge "Fix CarUiInstaller sometimes not called"