Merge changes I09bce218,Id5716a34 into ub-launcher3-calgary

* changes:
  Matching hotseat to spec.
  Fixing issue with shadow drawing over search bar.