Merge "Stop lock on GMSCore crashloop" into udc-dev