Merge \"Properly tint crash dialog.\" into nyc-mr1-dev
am: 44d909c971

Change-Id: Id2f1f4c9e9f9f3ba96ff501121d2ec9d806ddfb7