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

Change-Id: Ifc5c7d4493703bb16788165ea60c8a35408b259b