Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev