GitLab

Also, fix issue where mako was crashing because
Launcher was trying to load a custom cling for it.
It was doing this because a custom home layout was
specified by SetupWizard, but for now we only want
custom clings on large devices

Bug: 7302705
Bug: 6992663

This reverts commit 2ebcf509.

Change-Id: I46533309d5c62edfbd3a3b178c6965ffc73b6476