Merge "Ensure matching insets for taskbar gesture and 3 button nav" into udc-qpr-dev