Merge "SystemUI: Fix signal bar icon overlay issue"