Merge "Do not show the redundant RemoveAccountFailureDialog" into sc-v2-dev