Merge "Fix TaskView bind and orientation state called multiple times" into udc-qpr-dev