Revert "Merging  ub-launcher3-master, build 5938524"

This reverts commit 7cb721fa819992391045e70e5c109d8d43099a78.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I10ebd177cc98be896282147df481b05f28241758
205 files changed