Merge "Optimize HWUI ADPF for sysui and ensure correct closure" into main