Merge "Save and Restore user.home Property" into ics-mr0