am 461254b8: Merge "Remove unneeded abstraction in displaying dialogs." into lmp-mr1-dev

* commit '461254b8249fb9c144f0fa9e60720b4a3d0cb696':
  Remove unneeded abstraction in displaying dialogs.