Merge "boot animation is dithered and scaled" into ics-mr1