Merge "Fallback to ShortcutManager if AppPredictor has crashed" into udc-dev