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

* commit '09c17150f95dfdde2d737049dcecb3b04a160db5':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I77e998c444e5cd92422b9e176f5c9aea8526e6ce