Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev