am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev

* commit 'd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b':
  Move task to top in window manager.