Merge "Preventing widgets that don't fit from showing in tray. (Bug 6331357)"