Merge "Cache call to WM#hasNavigationBar" into main