am 26c2842f: Merge "Preventing overdraw in custom content screen" into ub-launcher3-burnaby

* commit '26c2842f07668385b8f4594848cf6e93502da4a3':
  Preventing overdraw in custom content screen