Merge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev