Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev