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

Change-Id: I11fc01bb9c49a749932a2aaee8b83c53a0c47a4f