Merge "Adds alpha to dimmed backgrounds" into nyc-dev