Create highlight elements on demand

Instead of guessing how many we will need then removing
them at position time if they are no longer visible.

Change-Id: I4b0b571997289426c4f7aac790adffc05198d2ba
Merge "Create highlight elements on demand"