Merge "Rename the activity lifecycle sample's directory" into ics-mr1