Merge "Disable 3-button-nav buttons during back button hold" into main