Merge "Introduce persistent forms of Activity lifecycle calls."