Revert "Revert: 7a227d06b843312b48e4789eddbf9ffd8bf4d5bc, as it would open a new activity on top of the new one"

This reverts commit 63221c1fe2cd668918228ea4638bc19066e8510d.
Merge branch 'master' into dev