Merge "hwui: add missing <mutex> include" into main