Revert "Merge pull request #17164 from mcjimenez/bug978785"

This reverts commit 73c3a1305da4a949c1634a009c400bc2431848d2, reversing
changes made to 9f4de77d34987e5e10fdc1abe374937b953af70d.
Revert "Merge pull request #17072 from KevinGrandon/bug_971497_system2_home_gesture_2"

This reverts commit 632f28b224582b77dac0c70aa78ed171347b62af, reversing
changes made to 09c69607071109a9fa9a5831acde7f66df0ba8d0.