Merge "Make HWUI's surface Reliable^TM"