Merge "SystemUI: Make wifi combo margin themable"