Merge "Fix the service binding skipOomAdj logic" into main