am cdc49731: Merge "Ignore requests to add items to non-existant screens." into froyo