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