Merge "Keep satellite gateway service alive during a session" into udc-dev