Merge "Fix extra onStop when finishing after onCreate" into qt-dev
am: 008483c045

Change-Id: I3981baeae3179677f1f80fd9db43cf6443940519