Revert: base: Fix screen recorder

Change-Id: I2c11a9eda0efa1175812e73ae467056e37f28d3c