Merge "Fix problem adding too many frames." am: 9074871af2 am: 19009e036a
am: c115300669

Change-Id: Ia279729b505f806014cb494bfa70c4e072fb2cd5