Merge "Avoid unnecessary predictor recreations." into ub-launcher3-rvc-dev am: fcfba815af

Change-Id: I560a4bc7efbea2c0c59fe81461a9bb244e6f127a