Merge "Propagate intent extras and finish activity properly" into qt-dev