Nag overlay fixes

Fixes a regression causing the image preview not to be shown. Updates in
colors, copy text order from design.

Change-Id: I0e8507b9311f83d1ac99fd4541a1d62028a2aa05
Merge "Nag overlay fixes"