Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0