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

Change-Id: I513b505be9cd3b273b76bd3d8578326400ddceb3