Merge "Retry AppStandbyControllerTest bucket checking" into sc-dev