am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"

* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
  FIX Null Pointer Exception on dialog cancel