Merge "Consolidate ActivityRecord#completeFinishing checking"