Merge "OPP: Remove try again button for failed transfer"