Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona

master -> merge
v1-train -> no merge