Revert "Fix navbar and navring last app toggle"

This reverts commit 120eace18c415915d23551d0c9f764de039534a3.
Revert "Last App Toggle [2/2]"

This reverts commit 656f5e0d501f5640b882e82cd94dd63ad2a86783.