Revert "Fix jank when switching themes"

This reverts commit e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.

Fixes crashloop with lock pattern

Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes: 63980375
(cherry picked from commit 6498f962836ff75d55510fbe0d8ddfd3c5f5dc34)
18 files changed