Merge "Remove prolonged animations" into pi-dev