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

Change-Id: I36a0e16389ebfa9c39193ac983bfaaff11f312ae