Merge "Clean up activity/stack associations." into oc-dev
am: 9f467df804

Change-Id: I1c7d75fec994d50cdb55fb798e4ed0c9beadab09