Merge "uninstall_confirm layout is unused, hence remove it"