Merge "HWUI: remove the redundant present queue"