Merge "Wait enough time for WMS#waitForAnimationsToComplete" into sc-dev