Merge "deliver invalidate messages AFTER other messages" into gingerbread