fixed early exit when iterating Theme overlays
Merge pull request #1059 from reven86/next-clean

fixed early exit when iterating Theme overlays
Merge pull request #1062 from blackberry/master

Merge master to next