Merge "3252698: Make drawing target 60fps." into ics-mr1