Merge "Clean up a flag for respecting nosensor and locked when docked." into udc-dev