Tweak disabled and cancel button colors

Make the disabled button look more disabled and the cancel button less
disabled (can be observed on the photo upload overlay).

Change-Id: Iac68ef7351c515a182816f716ba46d655f066704
Merge "Tweak disabled and cancel button colors"