Merge "Remove unneeded abstraction in displaying dialogs." into lmp-mr1-dev