Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev