Revert "Revert "Remove, unneeded is launcher enabled""

This reverts commit 2260502c.

Reason for revert: Going back to original as the revert is not needed because of http://ag/7969528

Change-Id: I04d1ca28b09dde4f58cbda2d8c2db77a4afaf5a7