Revert "Fix NavBar & SystemBar sizing issues"

This reverts commit 182f2c74d0204fe2cc208b9e619851e67858d952.