Merge "Finish rotation controller if the pending change is gone" into udc-dev