Merge "Fade in background scrim when resuming from screen off." into ub-launcher3-dorval-polish
am: 9e00b3c503

Change-Id: I8fe3eb9552bc7d59bdf3ecea1415e75fdfce6a69