Always scan the Settings app for updated shortcuts. am: ac2898228e am: f0644d03a2 am: 4eb38c75f4
am: 9a9274186e

Change-Id: I6e26f3df974ae4c9f014c30e25e0cd1598fee26f