Merge "Revert "Enable context dropping on stopped only"" into udc-dev