Merge "Support respecting nosensor and locked when docked." into tm-qpr-dev