Merge "The dialog should persist after rotation." into udc-dev