Merge "Initialize mInHalBypassMode to false" into main