Merge "Allow at most one pinned stack task." into oc-dev
am: 467deff7e9

Change-Id: If2e9badaeb31295468ce09ddbcdf45620121a7a6