Always scan the Settings app for updated shortcuts.
am: ac2898228e

Change-Id: I64f476ec3b4003e87004ab6c05536f91e659d39e