Merge "Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA"