Comment 5 for bug 497870

Yes, that is my proposed solution also. I will attach a separate patch for that issue so that it is easier to get the main application indicator patch upstream.