Merge "Revert "Revert "No NavigationBar layer in tablets""" into sc-v2-dev