Merge "Removing ViewScrim and cutom drawing code" into ub-launcher3-master