Revert "Merge pull request #18923 from timdream/two-homescreen-v1.3t"

This reverts commit 22f4b9c49578767f99bb15f514dbdccec24aa12b, reversing
changes made to 1177a857a3caeb8fd1feae94c83298a9144c2ff5.