merged ub-launcher3-dorval, and resolved conflicts Bug: 36904684 Bug: 37929893 Bug: 36068989
am: 93d0b87153  -s ours

Change-Id: I6749bff4ea4b8144a066a67902e19310d2bac30d