Merge "Revert "Make extra navigation bar count towards non decor frame"" into tm-dev