Comment 2 for bug 1239154

Can you break the patch into two pieces, one with the indicator stuff and one with just the basic cue behavior changes? A lot of the patch is non-controversial and could be merged in.