Merge "Allow second consecutive activity start." into qt-dev