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

* commit '8c475d5b0a18705aa8e76a1efa01b6860fc8ceae':
  Adds alpha to dimmed backgrounds

Change-Id: Id58651cfd6bf2be8e47c7d59bce96779cb1539f5