am 7594d78c: Merge "Check for cases before clearing dialog." into lmp-mr1-dev

* commit '7594d78c155773244ad1ef714e75f1ed30b51c15':
  Check for cases before clearing dialog.