This reverts commit 2fa2671b. Reason for revert: This breaks SF when running flicker tests for quick switch Change-Id: If0cfe67801b3ea55e480b42f0ceb75221563b0c7