Merge "Fix drawing order bug"