Merge "Fixing clip mask not getting initialized properly." into ub-launcher3-dorval-polish
am: 2348796e36

Change-Id: If8a8c8895a9e0170355d98fae044b986d42d62ac