Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev