Merge "allow openPreviousVersionPopup test to handle modern UI aLaCarte dialog"