Merge "Add a sleep in testSetDismissMessage(), to allow enough time for the dialog to be dismissed. No failure in 20+ tests." into klp-modular-dev