Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0