Merge "Restores state of AppPredictionService after remote service crash" into qt-dev
am: b143fe4928

Change-Id: Icdaa54461e326926b635c26246e1222da37e4241