This reverts commit a5df2171. Reason for revert: extreme QS jank due to expensive operation in update Change-Id: Ia32d17b713be103f0812847f2ab08d761d9096b0 Fixes: 186845565