Merge "Launch all activities into the same display" into tm-qpr-dev