Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 am: 8c475d5b0a" into nyc-mr1-dev-plus-aosp