Merge "Propagate intent extras and finish activity properly" into qt-dev
am: 7ac16f152e

Change-Id: I5bc447218d41fc098ea489c5fb8defdf5381f88d