Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev