c2668b889f
This reverts commit 2e3b7c6e97.
Reason for revert: regression, see b/186163921
Bug: 186163921
Change-Id: Ida9a225e0880babc3bb08da4fa6f559031c728f7
Test: manual with YT in gesture navigation mode