Merge "Allow to launch activity without specifying display id"