Fixed a bug where the fade in from dark would not work properly am: 7baaa9e82b
am: 223b854ac5

Change-Id: I8f929f80264f7a08fb113b0c13e99836ad75e732