Merge "Add a 5 second timeout to launch animation touch blocking" into udc-qpr-dev