3f651657f7
This reverts commit 0c32760b3c.
Reason for revert: Issue on smaller screen b/416220478#comment7
Bug: 416220478
Change-Id: I8b1063a1ebc8b250e41d2587399647a589ef05b8