Merge "Enforce background fallback to be non-translucent" into nyc-dev
am: a35724f666

* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
  Enforce background fallback to be non-translucent

Change-Id: If68ead500309566e66230b079f71667e0d555be0