Fixed: Activity-Dialogs in wrong order (bug#9937).
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2