Merge "Home should not be persistent." into ics-mr0