Merge "Add more conditions for showing InstallFailed dialog" into main