0c3c4d1c7d
Revert "Remove obsolete workaround." This reverts commit 5e48241a95b843c10f96c57d8544af9d04807218. Bug: 72143978 Bug: 24465209 Test: Tested failing case on sailfish, reverted back all CL's since Test: 3471433 for b/24465209 and apps open