Merge "Change the feature flag for Hearing Aid behavior" into pi-dev