Merge "Minor changes in ChoreographerCompat"