automerge: 74882cb
* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
Don't override dialog icon drawable unless valid resource ID was set
automerge: 74882cb
* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
Don't override dialog icon drawable unless valid resource ID was set