Merge "Enable configurable bind service flags" into main