Merge "Re-apply Day/Night to all Activities" into mnc-ub-dev
am: c12e7b7

* commit 'c12e7b796da9cd734298b79579b5243a00951970':
  Re-apply Day/Night to all Activities

Change-Id: I88e8da79e9dd6d17c85b36636d5745c095fe9cec