Merge "Minimum 1 frame timeline in java Choreographer" into udc-qpr-dev