Merge \"Don\'t backup & restore disabled shortcuts.\" into nyc-mr1-dev
am: 4885b274c1

Change-Id: I23c46fa144ac1b4989a4cd93cf442b812c7d1324