Merge "Fix window clipped in three-button-nav on phone factors" into main