6ca6de89c0
This reverts commit 2cdc359b84.
Reason for revert: this brokes split screen and result to device reboot.
Bug: 197293995
Change-Id: I154287230fa3849cad1c0e337e3bf3fd826257a4