Merge "Moves the embedded task to back when it become invisible" into udc-qpr-dev