Merge "Moving the scrim to draglayer" into ub-launcher3-calgary-polish
am: 2fb1356be6

Change-Id: Icd9de3ac14653823a44f052fb2fc361a7eb79c56