Revert "Ensure checkToggleView() fires at appropriate time" - infinite recursion again

This reverts commit 4d36aec7d8cf569660387623957a6398ad8b49d2.

Change-Id: Ia858d9b4829097142726da95c0d69496d4be22e0
Merge "Revert "Ensure checkToggleView() fires at appropriate time" - infinite recursion again"