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

Change-Id: I341f9278e088235545897be6f7bd896a19c4ac46