Merge "[DO NOT MERGE] Make extra navigation bar count towards non decor frame" into sc-v2-dev