Merge "Timely color fix" into dalvik-dev