Merge "Allow second consecutive activity start." into qt-dev
am: 8cee482fdd

Change-Id: I8962f77bffe7b146ebb87c9a3b34aa2e95c4dd79